merge trunk
authorK. Handa <handa@gnu.org>
Mon, 8 Jul 2013 05:42:36 +0000 (14:42 +0900)
committerK. Handa <handa@gnu.org>
Mon, 8 Jul 2013 05:42:36 +0000 (14:42 +0900)
commitd4c20c698bf11e27a5188fa0b7be5d89aef4a2dd
tree8b2601d264c1b63a6872f3c48d5014d9391eda81
parente0f9f4307c38a2848d009d8b6d2de9924197117a
parent9a4afe901fc17e074796000f5896c1b5b68c26f1
merge trunk